From: robertlipe Date: Wed, 8 Jul 2015 17:50:18 +0000 (+0000) Subject: A bunch of busy work to satisfy hyperactive warnings in newer GCC builds. X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~10^2~25 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dcf0dd85a71c6fa5fc3dac72520c2070ba051108;p=gpsbabel.git A bunch of busy work to satisfy hyperactive warnings in newer GCC builds. --- diff --git a/gpsbabel/an1.cc b/gpsbabel/an1.cc index 9edd025d0..b261c82ff 100644 --- a/gpsbabel/an1.cc +++ b/gpsbabel/an1.cc @@ -639,6 +639,7 @@ static void Read_AN1_Header(gbfile* f) unsigned short type; magic = ReadShort(f); + (void) magic; // hush warning. type = ReadShort(f); last_read_type = type; diff --git a/gpsbabel/dg-100.cc b/gpsbabel/dg-100.cc index e612e0cc7..9f519a5ed 100644 --- a/gpsbabel/dg-100.cc +++ b/gpsbabel/dg-100.cc @@ -509,6 +509,8 @@ dg100_recv_frame(struct dg100_command** cmdinfo_result, uint8_t** payload) } payload_checksum = be_read16(buf + frame_len - 4); frame_end_seq = be_read16(buf + frame_len - 2); + (void) payload_end_seq; + (void) frame_end_seq; dg100_log("RX: Start %04x Len %04x Cmd: %s\n", frame_start_seq, payload_len_field, cmdinfo->text); diff --git a/gpsbabel/dmtlog.cc b/gpsbabel/dmtlog.cc index bccea5aa8..00d3de903 100644 --- a/gpsbabel/dmtlog.cc +++ b/gpsbabel/dmtlog.cc @@ -433,6 +433,7 @@ read_CTrackFile(const int version) ux = gbfgetint32(fin); // Unknown 2 ux = gbfgetint32(fin); // Unknown 3 ux = gbfgetint32(fin); // Unknown 4 + (void) ux; // Silence warning. track = route_head_alloc(); track_add_head(track); diff --git a/gpsbabel/garmin_xt.cc b/gpsbabel/garmin_xt.cc index 037708618..6d98d59b9 100644 --- a/gpsbabel/garmin_xt.cc +++ b/gpsbabel/garmin_xt.cc @@ -107,6 +107,7 @@ format_garmin_xt_rd_st_attrs(char* p_trk_name, uint8_t* p_track_color) trackbytes = gbfgetuint16(fin); TrackPoints = gbfgetuint16(fin); + (void) TrackPoints; switch (method) { case 1: @@ -239,7 +240,7 @@ format_garmin_xt_proc_strk(void) uint8_t ii; // temp variable double Lat = 0, Lon = 0; // wpt data double PrevLat = 0, PrevLon = 0, PrevEle = 0; // wpt data - uint32_t Time = 0, PrevTime =0; // wpt data + uint32_t Time = 0; // wpt data int FirstCoo; uint8_t trk_color = 0xff; @@ -308,7 +309,6 @@ format_garmin_xt_proc_strk(void) } PrevLat = Lat; PrevLon = Lon; - PrevTime = Time; } } diff --git a/gpsbabel/jeeps/gpsapp.cc b/gpsbabel/jeeps/gpsapp.cc index a3a98d6ad..421bd4062 100644 --- a/gpsbabel/jeeps/gpsapp.cc +++ b/gpsbabel/jeeps/gpsapp.cc @@ -4484,11 +4484,8 @@ void GPS_D310_Get(GPS_PTrack* trk, UC* s) ************************************************************************/ void GPS_D311_Get(GPS_PTrack* trk, UC* s) { - UC* p; short identifier; - p=s; - /* Forerunner */ identifier = GPS_Util_Get_Short(s); sprintf((*trk)->trk_ident, "%d", identifier); diff --git a/gpsbabel/jeeps/gpsusbcommon.cc b/gpsbabel/jeeps/gpsusbcommon.cc index d16eefd82..14b7a0ac8 100644 --- a/gpsbabel/jeeps/gpsusbcommon.cc +++ b/gpsbabel/jeeps/gpsusbcommon.cc @@ -83,10 +83,8 @@ gusb_cmd_get(garmin_usb_packet* ibuf, size_t sz) { int rv; unsigned char* buf = (unsigned char*) &ibuf->dbuf; - int orig_receive_state; unsigned short pkt_id; top: - orig_receive_state = receive_state; switch (receive_state) { case rs_fromintr: rv = gusb_llops->llop_get_intr(ibuf, sz); diff --git a/gpsbabel/lowranceusr4.cc b/gpsbabel/lowranceusr4.cc index a0a5c644a..561b7d481 100644 --- a/gpsbabel/lowranceusr4.cc +++ b/gpsbabel/lowranceusr4.cc @@ -419,6 +419,7 @@ lowranceusr4_parse_waypoints(void) used in usr4 match those from usr{2,3} so we need a new mapping. */ icon_num = gbfgetint16(file_in); + (void) icon_num; // Hush warning for now. /* wpt_tmp->icon_descr = lowranceusr_find_desc_from_icon_number(icon_num); */ /* Color ID, discard for now */ @@ -759,8 +760,11 @@ data_read(void) /* for now we won't use these for anything */ create_date = gbfgetint32(file_in); + (void) create_date; create_time = gbfgetint32(file_in); + (void) create_time; byte = gbfgetc(file_in); /* unused, apparently */ + (void) byte; serial_num = gbfgetint32(file_in); if (global_opts.debug_level >= 1) { diff --git a/gpsbabel/mapsend.cc b/gpsbabel/mapsend.cc index a887c99d5..b0caad99a 100644 --- a/gpsbabel/mapsend.cc +++ b/gpsbabel/mapsend.cc @@ -126,8 +126,10 @@ mapsend_wpt_read(void) wpt_tmp->description = gbfgetpstr(mapsend_file_in); wpt_number = gbfgetint32(mapsend_file_in); + (void) wpt_number; // hush warning. wpt_icon = gbfgetc(mapsend_file_in); wpt_status = gbfgetc(mapsend_file_in); + (void) wpt_status; // hush warning. wpt_tmp->altitude = gbfgetdbl(mapsend_file_in); wpt_tmp->longitude = gbfgetdbl(mapsend_file_in); diff --git a/gpsbabel/mmo.cc b/gpsbabel/mmo.cc index f2d071f04..ee7a53bf1 100644 --- a/gpsbabel/mmo.cc +++ b/gpsbabel/mmo.cc @@ -399,6 +399,7 @@ mmo_read_CObjIcons(mmo_data_t* data) DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16)); } u16 = gbfgetuint16(fin); + (void) u16; DBG((sobj, "unknown value = 0x%04X\n", u16)); u16 = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X\n", u16)); @@ -459,6 +460,7 @@ mmo_read_CObjWaypoint(mmo_data_t* data) DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16)); u16 = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16)); + (void) u16; } wpt->latitude = gbfgetdbl(fin); @@ -542,6 +544,7 @@ mmo_read_CObjWaypoint(mmo_data_t* data) ux = gbfgetuint32(fin); DBG((sobj, "proximity type = %d\n", ux)); + (void) ux; data->loaded = 1; @@ -582,10 +585,12 @@ mmo_read_CObjRoute(mmo_data_t* data) DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16)); u16 = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16)); + (void) u16; } ux = gbfgetc(fin); /* line label */ DBG((sobj, "line label = %d\n", ux)); + (void) ux; data->left = rtept = gbfgetint16(fin); DBG((sobj, "route has %d point(s)\n", rtept)); @@ -657,6 +662,7 @@ mmo_read_CObjTrack(mmo_data_t* data) DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16)); u16 = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (since 0x18)\n", u16)); + (void) u16; } tp = gbfgetint16(fin); @@ -681,10 +687,12 @@ mmo_read_CObjTrack(mmo_data_t* data) uint16_t ux; ux = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (%d)\n", ux, ux)); + (void) ux; if (unk > 1) { uint16_t ux; ux = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (%d)\n", ux, ux)); + (void) ux; } } track_add_wpt(trk, wpt); @@ -710,6 +718,7 @@ mmo_read_CObjTrack(mmo_data_t* data) trk->line_color.bbggrr = gbfgetuint32(fin); /* rgb color */ trk->line_color.opacity = 255; DBG((sobj, "color = 0x%06X\n", trk->line_color.bbggrr)); + (void) u32; } if (mmo_version >= 0x12) { @@ -735,6 +744,7 @@ mmo_read_CObjTrack(mmo_data_t* data) DBG((sobj, "unknown value = 0x%04X (since 0x16)\n", u16)); u16 = gbfgetuint16(fin); DBG((sobj, "unknown value = 0x%04X (since 0x16)\n", u16)); + (void) u16; } } @@ -762,6 +772,8 @@ mmo_read_CObjText(mmo_data_t* data) lat = gbfgetdbl(fin); lon = gbfgetdbl(fin); DBG((sobj, "coordinates = %f / %f\n", lat, lon)); + (void) lat; + (void) lon; text = mmo_readstr(); DBG((sobj, "text = \"%s\"\n", text)); @@ -793,6 +805,8 @@ mmo_read_CObjCurrentPosition(mmo_data_t* data) lat = gbfgetdbl(fin); lon = gbfgetdbl(fin); DBG((sobj, "coordinates = %f / %f\n", lat, lon)); + (void) lat; + (void) lon; mmo_fillbuf(buf, 24, 1); if (mmo_version >= 0x18) { @@ -881,6 +895,7 @@ mmo_read_object(void) data->visible = gbfgetc(fin); obj_type = gbfgetuint32(fin); + (void) obj_type; #ifdef MMO_DBG uint32_t expected_type = 0xFFFFFFFF; if (objid == ico_object_id) { diff --git a/gpsbabel/nmea.cc b/gpsbabel/nmea.cc index 525300f45..6b221a313 100644 --- a/gpsbabel/nmea.cc +++ b/gpsbabel/nmea.cc @@ -674,7 +674,7 @@ gpgsa_parse(char* ibuf) { char fixauto; char fix; - int prn[12]; + int prn[12] = {0}; int scn,cnt; float pdop=0,hdop=0,vdop=0; char* tok=0; @@ -685,7 +685,9 @@ gpgsa_parse(char* ibuf) &fixauto, &fix, &prn[0],&prn[1],&prn[2],&prn[3],&prn[4],&prn[5], &prn[6],&prn[7],&prn[8],&prn[9],&prn[10],&prn[11]); - + if (scn < 4) { + warning(MYNAME ": Short GSA sentence."); + } /* sscanf has scanned all the leftmost elements we'll rescan by skipping 15 commas to the dops diff --git a/gpsbabel/psitrex.cc b/gpsbabel/psitrex.cc index 8f2dc0b35..9f0dd9ca5 100644 --- a/gpsbabel/psitrex.cc +++ b/gpsbabel/psitrex.cc @@ -390,14 +390,9 @@ static void psit_route_r(gbfile* psit_file, route_head** rte) { char rtename[256]; - unsigned int rte_num; - - int garmin_icon_num; - + int garmin_icon_num; route_head* rte_head; - unsigned int rte_count; - - Waypoint* thisWaypoint; + Waypoint* thisWaypoint; psit_getToken(psit_file,psit_current_token,sizeof(psit_current_token), ltrimEOL); @@ -414,10 +409,6 @@ psit_route_r(gbfile* psit_file, route_head** rte) route_add_head(rte_head); *rte = rte_head; - rte_num = 0; - - rte_count = 0; - psit_getToken(psit_file,psit_current_token,sizeof(psit_current_token), wscomma); while (psit_isKnownToken(psit_current_token) != 0) { @@ -470,17 +461,14 @@ static void psit_routehdr_w(gbfile* psit_file, const route_head* rte) { unsigned int rte_datapoints; - QString rname; - - Waypoint* testwpt; - time_t uniqueValue = 0; - int allWptNameLengths; + QString rname; + Waypoint* testwpt; + time_t uniqueValue = 0; queue* elem, *tmp; /* total nodes (waypoints) this route */ rte_datapoints = 0; - allWptNameLengths = 0; if (rte->waypoint_list.next) { /* this test doesn't do what I want i.e test if this is a valid route - treat as a placeholder for now */ @@ -527,11 +515,9 @@ psit_track_r(gbfile* psit_file, route_head** trk) unsigned int trk_num; struct tm tmTime; - time_t dateTime = 0; + time_t dateTime = 0; route_head* track_head = NULL; - unsigned int trk_count; - - Waypoint* thisWaypoint; + Waypoint* thisWaypoint; psit_getToken(psit_file,psit_current_token,sizeof(psit_current_token), ltrimEOL); if (strlen(psit_current_token) == 0) { @@ -543,9 +529,6 @@ psit_track_r(gbfile* psit_file, route_head** trk) rtrim(trkname); trk_num = 0; - - trk_count = 0; - track_head = NULL; psit_getToken(psit_file,psit_current_token,sizeof(psit_current_token), wscomma); diff --git a/gpsbabel/saroute.cc b/gpsbabel/saroute.cc index 8c0ce54dc..4557e7775 100644 --- a/gpsbabel/saroute.cc +++ b/gpsbabel/saroute.cc @@ -224,7 +224,10 @@ my_read(void) addrlen = le_read16(&record[obase]); cmtlen = le_read16(&record[obase+2+addrlen]); + (void) cmtlen; #if NEW_STRINGS + // That we've had no bugreports on this strongly indicates this code + // is never used... wpt_tmp->shortname = "booger"; wpt_tmp->notes = "goober"; #else diff --git a/gpsbabel/vitosmt.cc b/gpsbabel/vitosmt.cc index 41f0d9d27..6d1471360 100644 --- a/gpsbabel/vitosmt.cc +++ b/gpsbabel/vitosmt.cc @@ -99,6 +99,7 @@ vitosmt_read(void) count = gbfgetint32(infile); /* n */ check1 = gbfgetint32(infile); /* 0 */ check2 = gbfgetint32(infile); /* not sure */ + (void) check2; // silence warning. check3 = gbfgetint32(infile); /* n */ if (version!=vitosmt_version) { diff --git a/gpsbabel/vitovtt.cc b/gpsbabel/vitovtt.cc index 124742af2..4101ea1e9 100644 --- a/gpsbabel/vitovtt.cc +++ b/gpsbabel/vitovtt.cc @@ -111,6 +111,9 @@ vitovtt_read(void) /* * TODO: interpret speed, course, status */ + (void) speed; + (void) course; + (void) status; track_add_wpt(route_head, wpt_tmp);